Merge pull request #117 from jensjoha/faster_read_and_lookup

Faster read; faster lookup; more tests