Merge pull request #1 from vikinghug/development

Development
Changed Author to VikinghugUI
Merge branch 'master' into development