re-add terms and condish
Merge branch 'master' of https://github.com/athuras/divie