Fixing some bugs
Merge branch 'master' of https://github.com/godlikepanos/anki-3d-engine