Squashed a bug last minute
Merge branch 'master' of https://github.com/benjaminob6/GRP