reafctoring around indicator usage, in prep for using 4 byte indicators
Fix hung tests, reversed condition
Merge pull request #28 from JCTools/master

update latest minor changes