Merge pull request #17 from witboston/development

Development