Removed the untested code and tested it
Merge pull request #7 from basvodde/master

Moved command line code in a seperate class and tested it