feature commit 1
feature commit 2
feature commit 3
feature commit 4
Merge pull request #5 from paeder/feature

Feature