diff --git a/essh/cli.py b/essh/cli.py
index 73ddf7c..5ea120c 100644
--- a/essh/cli.py
+++ b/essh/cli.py
@@ -5,11 +5,11 @@
 from ec2.controller import EC2Controller
 from ssh.controller import SSHController
 
-@click.command()
+@click.command(context_settings=dict(ignore_unknown_options=True,))
 @click.option('--keypair-dir', default="~/.ssh", help='Directory where keypair files are located')
 @click.option('--keypair-extension', default="pem", help='File extension for keypari files')
 @click.argument('target')
-@click.argument('command', nargs=-1)
+@click.argument('command', nargs=-1, type=click.UNPROCESSED)
 def cli(keypair_dir, keypair_extension, target, command):
     cmd = " ". join(command)
     if len(cmd) > 0:
diff --git a/setup.py b/setup.py
index a856a17..b7cda36 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='essh',
-    version='0.3.1',
+    version='0.3.2',
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
@@ -21,7 +21,7 @@
     author="Patrick Cullen",
     author_email="patrickbcullen@gmail.com",
     url="https://github.com/patrickbcullen/essh",
-    download_url = "https://github.com/patrickbcullen/essh/tarball/v0.3.1",
+    download_url = "https://github.com/patrickbcullen/essh/tarball/v0.3.2",
     keywords = ['ssh', 'ec2', 'aws'],
     classifiers = []
 )