Merge develop with master for release v0.3