added username support
Merge branch 'Username'