Merge pull request #12 from budjb/development

Release 0.1.6