Merge dev to master for release 0.0.3