Refactor reader
Merge branch 'develop' into reader
Refactor Word2007 reader