Merge pull request #11 from will123195/master

map-reduce 6.0 compatibility
fixed indexedStream() - no longer matches on substring