Revert "Revert 146"
Merge pull request #156 from stankevich/revert-154-revert-146

Rollback "Revert 146"