Write statement fix
Merge pull request #4 from drewying/ClassFixBranch

Write statement fix
Merge remote-tracking branch 'upstream/master' into dev