commit from cris
Merge branch 'master' of github.com:lroth/btntt