diff --git a/pyrun b/pyrun
index d9f5d75..9aac2f2 100755
--- a/pyrun
+++ b/pyrun
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DIRECTORY=$(cd `dirname $0` && pwd)
-PYTHONPATH=$DIRECTORY:$PYTHONPATH
+DIRECTORY=$(cd "$(dirname "$0")" && pwd)
+export PYTHONPATH="${DIRECTORY}:${PYTHONPATH}"
 
-$*
+"$@"