diff --git a/AUTHORS b/AUTHORS
index 42c8351bb9..951570ee8b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -90,4 +90,5 @@ Nick Parlante <nick.parlante@cs.stanford.edu>
 Marko Seric <marko.seric@math.uzh.ch>
 Felipe Montoya <felipe.montoya@edunext.co>
 Julia Hansbrough <julia@edx.org>
-Nicolas Chevalier <nicolas.chevalier@epitech.eu>
\ No newline at end of file
+Pavel Yushchenko <pavelyushchenko@gmail.com>
+Nicolas Chevalier <nicolas.chevalier@epitech.eu>
diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index f6caee41c7..8a2ff099a1 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -309,13 +309,13 @@ class OptionInput(InputTypeBase):
         id==description for now.  TODO: make it possible to specify different id and descriptions.
         """
         # parse the set of possible options
-        lexer = shlex.shlex(options[1:-1])
+        lexer = shlex.shlex(options[1:-1].encode('utf8'))
         lexer.quotes = "'"
         # Allow options to be separated by whitespace as well as commas
         lexer.whitespace = ", "
 
         # remove quotes
-        tokens = [x[1:-1] for x in list(lexer)]
+        tokens = [x[1:-1].decode('utf8') for x in lexer]
 
         # make list of (option_id, option_description), with description=id
         return [(t, t) for t in tokens]
diff --git a/common/lib/capa/capa/tests/test_inputtypes.py b/common/lib/capa/capa/tests/test_inputtypes.py
index 626ed52d8c..0efd84f8cb 100644
--- a/common/lib/capa/capa/tests/test_inputtypes.py
+++ b/common/lib/capa/capa/tests/test_inputtypes.py
@@ -75,6 +75,10 @@ class OptionInputTest(unittest.TestCase):
         check("('a', 'b')", ['a', 'b'])
         check("('a b','b')", ['a b', 'b'])
         check("('My \"quoted\"place','b')", ['My \"quoted\"place', 'b'])
+        check(u"('б','в')", [u'б', u'в'])
+        check(u"('б', 'в')", [u'б', u'в'])
+        check(u"('б в','в')", [u'б в', u'в'])
+        check(u"('Мой \"кавыки\"место','в')", [u'Мой \"кавыки\"место', u'в'])
 
 
 class ChoiceGroupTest(unittest.TestCase):