Allow username to be different from environment
Merge pull request #2 from flxf/username

Allow username to be different from environment