Fixing polling
Merge pull request #1 from feliun/master

Fixing polling - thanks felipe