removed setTimeout
callback stuff for exit
Merge pull request #6 from samatt/master

stuff