Merge pull request #119 from chsticksel/develop

Kill all child processes after timeout

Closes  #118
Fix reference to renamed config.ml in Makefile
Merge pull request #124 from chsticksel/hotfix-config

Fix reference to renamed config.ml in Makefile
Merge remote-tracking branch 'upstream/develop' into develop