Merge pull request #43 from vikinghug/development

Update from Development
Merge pull request #47 from vikinghug/master

Merge pull request #43 from vikinghug/development