Merge pull request #13 from budjb/development

Release 0.1.7