Merge pull request #17 from hussfelt/development

Merge pull request #17  from hussfelt/testrepo1
Merge pull request #31 from hussfelt/development

{"commit_message"=>"Merging for v1.1 release"}
Ok, new test
Merge branch 'master' of https://github.com/hussfelt/testrepo1 into development