Merge pull request #43 from vikinghug/development

Update from Development