Merge pull request #11 from jaensen/master

Test pull request
no
Commit test 2