Fixed #6: polling period should be configurable