Merge pull request #31 from vikinghug/development

Development