Revert "Merge pull request #9 from apolukhin/develop"

This reverts commit 5e607cb7bb4a4ada692f47eb5d6210c4948a7c5d, reversing
changes made to 7b2f0cfe8d88add21060d7c47756654f73a81c69.