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

Prep release