Merge pull request #16 from jwalkerbg/master

Translated
Ensure consistent indices regardless of user permissions
Merge pull request #17 from ande3577/master

Ensure consistent indices regardless of user permissions