Merge pull request #129 from rybakit/patch-1