Merge pull request #262 from yuvale/master