diff --git a/README.md b/README.md
index 839cffe35..cff14a26d 100644
--- a/README.md
+++ b/README.md
@@ -146,7 +146,7 @@ Basic features:
 Advanced package control:
 
 - Unpublishing packages (npm unpublish) - **supported**
-- Tagging (npm tag) - supported
+- Tagging (npm tag) - **supported**
 - Deprecation (npm deprecate) - not supported
 
 User management:
@@ -158,6 +158,7 @@ Misc stuff:
 
 - Searching (npm search) - **supported** (cli / browser)
 - Starring (npm star, npm unstar) - not supported, doesn't make sense in private registry
+- Ping (npm ping) - **supported** 
 
 ## Storage
 
diff --git a/lib/index-api.js b/lib/index-api.js
index f9cb68610..f913070dd 100644
--- a/lib/index-api.js
+++ b/lib/index-api.js
@@ -474,6 +474,11 @@ module.exports = function(config, auth, storage) {
     });
   });
 
+  // npm ping
+  app.get('/-/ping', function(req, res, next) {
+      next({});
+  });
+
   return app;
 };
 
diff --git a/lib/storage.js b/lib/storage.js
index abafdb471..5201dcb31 100644
--- a/lib/storage.js
+++ b/lib/storage.js
@@ -10,10 +10,10 @@ const MyStreams = require('./streams');
 const Proxy = require('./up-storage');
 const Utils = require('./utils');
 
-//
-// Implements Storage interface
-// (same for storage.js, local-storage.js, up-storage.js)
-//
+/**
+ * Implements Storage interface
+ * (same for storage.js, local-storage.js, up-storage.js).
+ */
 class Storage {
 
   /**