Fixed deadlock
:Merge branch 'master' of github.com:heioghaa/ttm