switch out a busy wait with a call to 'poll'
Merge branch 'feature/async_io' into develop