issue#127 - unfinished
Merge pull request #129 from igoryen/issue#127

issue#127 - unfinished