Merge pull request #12 from bendyworks/fall_back_to_username

Fall back to username