Improvements on command line, also added some comments.
Merge pull request #1 from derFunk/master

Improvements on command line, also added some comments.