Develop

Merged develop into master for 0.1 release