Version Upgrade and added command line parameters