ECS changes, Timout Exception Handling
Merge branch 'master' of https://github.com/figlesta/dsws13m3