Finished CommandLine parsing stuff
Merge branch 'TingBranch' into QuangBranch
Merge branch 'QuangBranch' into TingBranch