added command line argument parser
Merge branch 'nick'