diff --git a/README.md b/README.md
index 666b26f..d4b6a15 100644
--- a/README.md
+++ b/README.md
@@ -25,11 +25,11 @@ Clone the repository, mount its directory as a volume into
     myapp-postgresql:
         image: postgres:9.6.2
         volumes:
-            - ../docker-posgresql-multiple-databases:/docker-entrypoint-initdb.d
+            - ../docker-postgresql-multiple-databases:/docker-entrypoint-initdb.d
         environment:
-            - POSTGRES_MULTIPLE_DATABASES=db1,db2
-            - POSTGRES_USER=myapp
-            - POSTGRES_PASSWORD=
+            - POSTGRES_MULTIPLE_DATABASES: db1,db2
+            - POSTGRES_USER: myapp
+            - POSTGRES_PASSWORD:
 
 ### By building a custom image
 
@@ -45,6 +45,13 @@ to the container:
     myapp-postgresql:
         image: eu.gcr.io/your-project/postgres-multi-db
         environment:
-            - POSTGRES_MULTIPLE_DATABASES=db1,db2
-            - POSTGRES_USER=myapp
-            - POSTGRES_PASSWORD=
+            - POSTGRES_MULTIPLE_DATABASES: db1,db2
+            - POSTGRES_USER: myapp
+            - POSTGRES_PASSWORD:
+
+### Non-standard database names
+
+If you need to use non-standard database names (hyphens, uppercase letters etc), quote them in `POSTGRES_MULTIPLE_DATABASES`:
+
+        environment:
+            - POSTGRES_MULTIPLE_DATABASES: "test-db-1","test-db-2"
diff --git a/create-multiple-postgresql-databases.sh b/create-multiple-postgresql-databases.sh
index e883f80..aa665fa 100755
--- a/create-multiple-postgresql-databases.sh
+++ b/create-multiple-postgresql-databases.sh
@@ -10,10 +10,10 @@ function create_user_and_database() {
 	    CREATE USER $database;
 	    CREATE DATABASE $database;
 	    GRANT ALL PRIVILEGES ON DATABASE $database TO $database;
-	EOSQL
+EOSQL
 }
 
-if [ $POSTGRES_MULTIPLE_DATABASES ]; then
+if [ -n "$POSTGRES_MULTIPLE_DATABASES" ]; then
 	echo "Multiple database creation requested: $POSTGRES_MULTIPLE_DATABASES"
 	for db in $(echo $POSTGRES_MULTIPLE_DATABASES | tr ',' ' '); do
 		create_user_and_database $db