Polling added, issues: #4, #1, #5