Issue168 fixed.
Merge pull request #196 from ilya-murzinov/Issue168

Issue168 fixed.