Added support for abbreviated command line arguments. Result of fixing bug with partially matching arguments