Merge pull request #9 from wurfkeks/feature_commands

Feature commands
Merge branch 'master' into development