Merge 'Develop' into master.

Merge develop into master for the 0.1 release