Merge pull request #27 from michaelrice/development

Bug fix release