Merge pull request #16 from budjb/development

Version 0.2.0