Merge pull request #35 from vikinghug/development

Development
Merge branch 'development'
Merge pull request #51 from vikinghug/master

Branch update