Merge pull request #23 from atarr2/username_alternative