Merge pull request #31 from vikinghug/development

Development
Merge pull request #32 from vikinghug/master

Merge pull request #31 from vikinghug/development