Merge pull request #13 from vikinghug/development

Merge pull request #11 from vikinghug/master