Fixed issue where spaces in username caused problems

Fixed #78
Merge pull request #79 from tperez4/develop

Fixed issue where spaces in username caused problems