Partially revert 2115f0f
Merge pull request #83 from alexmarsev/revert

Partially revert 2115f0f