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

Prep release