Rewrite for I/O purposes
Merge remote-tracking branch 'github/master'