Merge dev into master

ready for version 0.3