iostools
merge conflict
Merge branch 'master' of github.com:wadecong/iostools
merged conflict from wadecong