Merge branch 'master' into delete_optparse

# Conflicts:
#	CHANGELOG.md

1 files changed, 1 insertions, 0 deletions

diff --git a/setup.py b/setup.py
index 9b0fea78..2221eae0 100755
--- a/setup.py
+++ b/setup.py
@@ -69,6 +69,7 @@ INSTALL_REQUIRES = ['pyparsing >= 2.0.1', 'pyperclip', 'six']
 EXTRAS_REQUIRE = {
     # Windows also requires pyreadline to ensure tab completion works
     ":sys_platform=='win32'": ['pyreadline'],
+    ":sys_platform!='win32'": ['wcwidth'],
     # Python 3.4 and earlier require contextlib2 for temporarily redirecting stderr and stdout
     ":python_version<'3.5'": ['contextlib2'],
     # Python 3.3 and earlier require enum34 backport of enum module from Python 3.4