#122 Fix
#120 fix. test improvement
Merge pull request #126 from TikhomirovSergey/master

#122 Fix