Development

#296 (closed) #295 (closed) #297 (closed) #298 (closed), #304 (closed), #302 (closed), #301 (closed), #300 (closed), #299 (closed) and #303 (closed)