Allow usernames to end in a digit.
Merge remote-tracking branch 'refs/remotes/ivan/bug/allow-usernames-ending-with-digit' into develop
Fix method names.
Work in progress...