Release prep
Merge pull request #127 from TazeTSchnitzel/releaseprep2.5.2

Release prep