Added commandline execution
Merge