Pre-release fixes
Merge pull request #82 from mitchellgordon95/master

Pre-release fixes