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

Catch up to IO spec changes