Added StringArgument and Wholeword option