Merge pull request #129 from cogmission/master

Merge changes for Kirill Solovyevk