Fixed Name
Fixed issue with arguments with spaces