Slava request changes.
Merge pull request #34 from ForceMan88/master

Slava request changes.