Username support
Fix README merge