Also consider phrase types
Merge branch 'master' of github.com:pquentin/thesis