This is my first commit
Merge pull request #16 from mstenzler/master

This is my first commit