Merge pull request #462 from ndawe/master

[MRG] minor io fixes
docs fixes