Issue #24 Fix custome roles' lang strings issue
Merge remote-tracking branch 'upstream/master'