Updated command line application

Please merge.