Prepare release
Merge pull request #197 from my-personal-forks/master

Prepare release