process timeouts and some refactoring
Merge pull request #53 from seva-ask/processTimeouts

process timeouts and some refactoring