f/1 c-1
Merge pull request #1 from gruetter/feature/1

ok, the first merge went through as expected