Added a set username method, checked for markDirty
Merge remote-tracking branch 'origin/master'