Pointer out of range fix
Another index fix
Merge branch 'master' into stableVersion