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

prep release