added timeout
Merge branch 'master' of github.com:anlif/sanntid