[update:] added ping and ping2
Merge branch 'development'