Prepare for refactoring
Merge pull request #139 from chdemko/master

Prepare for refactoring