Merge pull request #1 from lbargaoanu/master

Master
use Kill on timeout