simplify common handler
accomodate for changes in termit
Merge branch 'master' of https://github.com/dvv/stable