Added more command line args
Merge pull request #36 from anryko/master

Added more command line args