Merge pull request #6 from TBroedsgaard/testing

Testing
preparing break
Merge remote-tracking branch 'origin/master' into name-of-branch