Re-Add session timeout, disable by default
Merge pull request #34 from RavetcoFX/a10

Re-Add session timeout, disable by default