Issue #180 - Added server shutdown for polling server