Initial feature 2 commit
Merge pull request #2 from migstopheles/feature-2

Initial feature 2 commit