Enhanced poll implementation

Fixes #12
Fixes #13
Fixes #14