Merge develop into master

Using this as Version 0.1.0