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

Prepare release