code cleanup: removing compiler warnings
Merge remote-tracking branch 'origin/master'
add tests for indexing on maccs