Import from tenshi-0.15.tar.gz
Merge branch 'master' of github.com:sigio/tenshi