FIX BUGS IN DOC GENERATION
Merge branch 'master' of github.com:rconan/CEO