Added time limiting
Merge branch 'master' of https://github.com/seadsystem/Backend