Fixed bug in argument parsing to allow arguments with spaces
Fixed bug, trailing spaces in strings stripped.