First version finished
Added command line options
Merge remote-tracking branch 'origin/master'