Fixed Some bug.
Merge branch 'master' of https://github.com/thomas15v/TurtleFix