Merge pull request #42 from joates/master

username is *always* undefined (it doesn't exist)