Merge pull request #58 from Shimmur/development

Development