Use of index when running getRowId for performance
Fixed bug with indexing of columns during read
Merge branch 'master' into develop