Commit from branch
Merge pull request #2 from christianbach/feature

Commit from branch