Robust poll controllers.
Merge pull request #72 from g0v/feature/poll-controller

Robust poll controllers.