Catch up to IO spec changes
Merge pull request #125 from raydiak/master

Catch up to IO spec changes