1
Merge pull request #17 from hussfelt/development

Merge pull request #17  from hussfelt/testrepo1