Added support for timeouts
Merge branch 'feature/reorganise_specs'