diff --git a/README.md b/README.md
index 98c9003..96b5256 100644
--- a/README.md
+++ b/README.md
@@ -13,20 +13,21 @@ mount_nfs fs-7abd2444.efs.us-east-1.amazonaws.com:/ /mnt/efs
 
 ## Available functions
 The following functions are available at present
-* [restart_hs2](hive/hiveserver2.sh#L30) - Restart HiveServer2 JVM - works on both Hadoop2 and HiveServer2 cluster
 * [configure_awscli](misc/awscli.sh#L11) - Configure AWS CLI
-* [restart_master_services](hadoop/util.sh#L13) - Restart hadoop services on the cluster master
-* [restart_worker_services](hadoop/util.sh#L43) - Restart hadoop services on cluster workers
-* [use_java8](hadoop/util.sh#L61) - Use Java 8 for hadoop daemons and jobs
+* [install_python_venv](misc/python_venv.sh#L17) - Install and activate a Python virtualenv
+* [install_ranger](hive/ranger-client.sh#L13) - Install Apache Ranger client for Hive
 * [mount_nfs_volume](misc/mount_nfs.sh#L21) - Mounts an NFS volume on master and worker nodes
+* [restart_hs2](hive/hiveserver2.sh#L30) - Restart HiveServer2 JVM - works on both Hadoop2 and HiveServer2 cluster
 * [set_timezone](misc/util.sh#L14) - Set the timezone
 * [add_to_authorized_keys](misc/util.sh#L38) - Add public key to authorized_keys
 * [install_glue_sync](hive/glue-sync.sh#L11) - Installs Hive Glue Catalog Sync Agent
-* [install_ranger](hive/ranger-client.sh#L13) - Install Apache Ranger client for Hive
 * [start_history_server](spark/util.sh#L8) - Start Spark History Server
 * [stop_history_server](spark/util.sh#L20) - Stop Spark History Server
 * [restart_history_server](spark/util.sh#L32) - Restart Spark History Server
-* [install_python_venv](misc/python_venv.sh#L17) - Install and activate a Python virtualenv
+* [restart_master_services](hadoop/util.sh#L13) - Restart hadoop services on the cluster master
+* [restart_worker_services](hadoop/util.sh#L43) - Restart hadoop services on cluster workers
+* [use_java8](hadoop/util.sh#L61) - Use Java 8 for hadoop daemons and jobs
+* [wait_until_namenode_running](hadoop/util.sh#L82) - Wait until namenode is out of safe mode.
 
 ## Contributing
 Please raise a pull request for any modifications or additions you would like to make. There may be a delay between when you want to start using a method and when it might be available via Qubole's AMI. To work around this, it is recommended to put a placeholder `source` line in your bootstrap script. For example
diff --git a/hadoop/util.sh b/hadoop/util.sh
index 10d7be6..9eb38fb 100644
--- a/hadoop/util.sh
+++ b/hadoop/util.sh
@@ -74,10 +74,12 @@ function use_java8() {
  fi
 }
 
-# Wait until namenode is out of safe mode. Takes 2 optional params
+##
+# Wait until namenode is out of safe mode.
+# Takes 2 optional params
 # first : Number of attempts function will make to get namenode out of safemode. Default is 50
 # second : Number of seconds each attempt will sleep for waiting for namenode to come out of sleep mode. Default is 5sec
-function wait_until_namenode_out_of_safe() {
+function wait_until_namenode_running() {
     n=0
     attempts=${1:-50}
     sleep_sec=${2:-5}