Merge pull request #7 from michaelrice/development

Development