Fixed Warnings
Merge branch 'JuanBranch' of https://github.com/Chibin/The-Circle into JuanBranch