Prep release
Merge pull request #369 from my-personal-forks/prep-release

Prep release