Allow timeout to be specified on a per pop basis.

Would close issue #4