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

Prep release