Fixed bugs and removed unneeded logic.
Merge branch 'master' of https://github.com/Geekdude/Magic-Compass