Merge develop to master for 0.0.1 release