Added username restrictions
3.3.5
Merge branch 'master'
Fixed context