Fixed listener
Merge pull request #19 from buger/listener_limit

Fixed listener