Iff reading should work now for most applications.
Iff unit tests for a few cases. Need full coverage still.
Merge remote-tracking branch 'origin/master'