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

Prepare release