diff --git a/settings.py b/settings.py
index ec3773b709ea513cbaf668de0b1a446807ddaa32..e1994eb8bb2ed11377438176d9652b1e676ac466 100644
--- a/settings.py
+++ b/settings.py
@@ -86,7 +86,7 @@ SECRET_KEY = get_from_env('SECRET_KEY', 'replaceme')
 # If in production, you got a bad request (400) error
 #More info: https://docs.djangoproject.com/en/1.7/ref/settings/#allowed-hosts (same for 1.6)
 
-ALLOWED_HOSTS = ['localhost'] # change to your allowed hosts
+ALLOWED_HOSTS = get_from_env('ALLOWED_HOSTS', 'localhost').split(",")
 
 # Secure Stuff
 if (get_from_env('SSL', '0') == '1'):