Address Peter's comments from the code review.
Merge branch 'epoll' of github.com:nomis52/ola into epoll