Merge pull request #6 from budjb/development

Version 0.1.2