Merge dev into master

Version 0.0.3