merge test [f:2m]
master commit 1 [f:3m]
Merge pull request #3 from vorhorn/master

pull request time 2 [f:10m]