Release/version 0.3

Merge in release 0.3 into master branch