Merge pull request #638 from hnyman/statping