Adding server timeout feature

Closes #360