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

Prepare release