Commandline support

Added commandline support for a better result