Changed to not accept space to create new arguments
Fix for the arguments as described in issue 2
merge fix
Added fix that crappy mergetool deleted