Some improvements on semantic analysis
Merge branch 'master' of https://github.com/pnpo/doctools