Merge pull request #156 from adubovik/master