Added session timeout
Merge pull request #362 from dswd/session-timeout

Added session timeout