second commit
Merge pull request #5 from Borgaard/patch-1

second commit