Fix FOREVER bug in #97.
Merge pull request #100 from pretenders/97_timeout_behaviour

Fix FOREVER bug in #97.