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

Prepare release