Fixed algorithm problem, should work fine now.
Merge branch 'master' of http://github.com/SilentAkuma/Team-Sunshine