Fix PING/PONG. Not sure if this is 100% correct but at least it now works.
Merge pull request #1 from DavidJRobertson/fix_pong

Fix PING/PONG