Merged back (again) and added the PING command and module