commit
Merge branch 'master' of github.com:jeffreychien/ping

merge
fixed features content