bunch of stuff...
Merge branch 'master' of https://github.com/Chibin/The-Circle