updated polling networking
resolve merge conflicts
Merge pull request #102 from elgreco84/master

Added updated polling APIs