akarneliuk Merge pull request #138 from akarneliuk/0.8.13