make it easier to control from the command line
Merge pull request #1 from vapier/master

make it easier to control from the command line