Included Changes from 3DGameEngineCpp_60