Resolving a handler
Refactor
Drop Command from Translator Names
Merge branch 'develop'