Fixes
Merge branch 'master' of https://github.com/hooverr/3720_PROJECT