Add aliveTimeout
Merge branch 'master' of github.com:banaka/dc-3pc