Refactor reader
Merge branch 'develop' into reader
Refactor Word2007 reader
Small fixes for the last commit
Merge remote-tracking branch 'upstream/develop' into develop