add feature and fix for #2
implements #2
Merge pull request #3 from icoxfog417/commandline

implements Issue #2