Merge pull request #171 from AntonShevchuk/master

Fixed #160
Merge pull request #172 from AntonShevchuk/master

Hotfix for Helper trait
Small Translate refactoring