Added command line args
Merge branch 'master' of github.com:accidentalManual/1567