Small changes
Merge branch 'rendererBranch' of https://github.com/jtmzheng/3dss.git into rendererBranch