Prepare release
Merge pull request #325 from my-personal-forks/prep-release

Prepare release