Support activityTimeout 0
Merge pull request #115 from rodms10/timeout

Support activityTimeout of 0