added handlng command line args
Merge branch 'develop'