Cleaned up circle to work in more scenarios
Merge branch 'master' of https://github.com/Revision24601/Next36