This MR merges the latest changes from development into master.
development
master
This fixes #1 (closed).