Merge develop into master, so we can remove the develop branch.

fixes #10