UPoller - first commit
Merge https://github.com/lisandrocardoso/upoller