fixed
Merge branch 'master' of https://github.com/ziah/Nickname-Module
fixed again