diff --git a/storm/__init__.py b/storm/__init__.py
index <HASH>..<HASH> 100644
--- a/storm/__init__.py
+++ b/storm/__init__.py
@@ -69,7 +69,6 @@ class Storm(object):
 
         if order:
             config_data = sorted(config_data, key=itemgetter("host"))
-
         return config_data
 
     def delete_all_entries(self):
@@ -109,7 +108,6 @@ class Storm(object):
                 options.update({
                     key: value,
                 })
-
         return options
 
     def is_host_in(self, host):
diff --git a/storm/__main__.py b/storm/__main__.py
index <HASH>..<HASH> 100644
--- a/storm/__main__.py
+++ b/storm/__main__.py
@@ -18,6 +18,7 @@ from storm import web as _web
 from storm.kommandr import *
 
 from termcolor import colored
+from types import ListType
 
 storm_ = Storm()
 
@@ -166,8 +167,11 @@ def list():
                             extra = True
 
                             if isinstance(value, collections.Sequence):
-                                value = ",".join(value)
-
+                                if isinstance(value, ListType):
+                                    value = ",".join(value)
+                                else:
+                                    value = value
+                                    
                             result += "{0}={1} ".format(key, value)
                     if extra:
                         result = result[0:-1]
re #<I> fixing problem with custom options not displaying correctly