Merge master back to dev for release 0.0.3

Merge dev to master for release 0.0.3