Merge pull request #33 from rwst/t32

before make, make doc-clean
Merge branch 'master' into develop

* master: