Merge pull request #60 from Shimmur/development

Development