Merge pull request #2 from ebollens/master

Fix #2 - Command-line interface improvements
Merge branch 'master' of https://github.com/WebBlocks/WebBlocks