Changed Username: to Username / Email:
Merge pull request #1 from lexware/master

Changed Username: to Username / Email: