Merge pull request #7 from budjb/development

Version 0.1.3