Merge pull request #395 from anatoliychakkaev/master

Helpers