diff --git a/lib/utils.py b/lib/utils.py
index 63083b0..2a20ad3 100644
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -124,7 +124,6 @@ def searchThumbnail(options):
             options['--thumbnail'] = video_directory + video_file + ".jpeg"
     return options
 
-
 # return the nfo as a RawConfigParser object
 def loadNFO(options):
     video_directory = dirname(options.get('--file')) + "/"
@@ -169,7 +168,6 @@ def loadNFO(options):
     logging.info("No suitable NFO found, skipping.")
     return False
 
-
 def parseNFO(options):
     nfo = loadNFO(options)
     if nfo:
@@ -190,14 +188,22 @@ def parseNFO(options):
                 exit(1)
     return options
 
-
 def upcaseFirstLetter(s):
     return s[0].upper() + s[1:]
 
-
 def cleanString(toclean):
     toclean = toclean.decode('utf-8')
     toclean = unidecode.unidecode(toclean)
     cleaned = re.sub('[^A-Za-z0-9]+', '', toclean)
 
     return cleaned
+
+def decodeArgumentStrings(options, encoding):
+    if options["--name"] is not None:
+        options["--name"] = options["--name"].decode(encoding)
+
+    if options["--description"] is not None:
+        options["--description"] = options["--description"].decode(encoding)
+
+    if options["--tags"] is not None:
+        options["--tags"] = options["--tags"].decode(encoding)
diff --git a/prismedia_upload.py b/prismedia_upload.py
index ba86b86..df6ab30 100755
--- a/prismedia_upload.py
+++ b/prismedia_upload.py
@@ -62,12 +62,12 @@ Languages:
 from os.path import dirname, realpath
 import sys
 import datetime
+import locale
 import logging
 logging.basicConfig(format='%(asctime)s %(message)s', level=logging.INFO)
 
 from docopt import docopt
 
-
 # Allows a relative import from the parent folder
 sys.path.insert(0, dirname(realpath(__file__)) + "/lib")
 
@@ -108,7 +108,6 @@ VALID_LANGUAGES = ('arabic', 'english', 'french',
                    'japanese', 'korean', 'mandarin',
                    'portuguese', 'punjabi', 'russian', 'spanish')
 
-
 def validateVideo(path):
     supported_types = ['video/mp4']
     if magic.from_file(path, mime=True) in supported_types:
@@ -116,21 +115,18 @@ def validateVideo(path):
     else:
         return False
 
-
 def validateCategory(category):
     if category.lower() in VALID_CATEGORIES:
         return True
     else:
         return False
 
-
 def validatePrivacy(privacy):
     if privacy.lower() in VALID_PRIVACY_STATUSES:
         return True
     else:
         return False
 
-
 def validatePlatform(platform):
     for plfrm in platform.split(','):
         if plfrm.lower().replace(" ", "") not in VALID_PLATFORM:
@@ -138,14 +134,12 @@ def validatePlatform(platform):
 
     return True
 
-
 def validateLanguage(language):
     if language.lower() in VALID_LANGUAGES:
         return True
     else:
         return False
 
-
 def validatePublish(publish):
     # Check date format and if date is future
     try:
@@ -219,6 +213,7 @@ if __name__ == '__main__':
         '--version': bool
     })
 
+    utils.decodeArgumentStrings(options, locale.getpreferredencoding())
     options = utils.parseNFO(options)
 
     if not options.get('--thumbnail'):