Bugfix
[#2 state:in-progress]
Merge pull request #2 from mishakarpenko/misha/bugfix2

Bugfix [#2 state:closed]