Merge pull request #330 from ethomson/poll_inftim