Prepare release
Merge pull request #252 from my-personal-forks/prepare-release

Prepare release