Redlizard fixed some stuff up
Merge branch 'master' of https://github.com/ZackMullaly/Compass

Forgot to pull after Shiz submitted his change.