Merge pull request #59 from ifreecarve/2013-11-18_timeout_fix

Fix incorrect timeout behavior in waitUntil( ) caused by filter function delays
Merge pull request #60 from ifreecarve/master

Reliability fixes