Merge pull request #82 from mitchellgordon95/master

Pre-release fixes
Added some fixes.
Updated line numbers to reflect pre-release fixes