minor fixes

minor fixes and updated demo app to accept email address as user name
Merge changes
Merge branch 'genuinebasil-master'