diff --git a/parser/parser-vasp/vaspparser/setup_paths.py b/parser/parser-vasp/vaspparser/setup_paths.py
index e0a0fb009256a0d4056e81c12e82d15bfd3ea7c4..1202df85661eac3d2c7df77a015d9c7e6c324ece 100644
--- a/parser/parser-vasp/vaspparser/setup_paths.py
+++ b/parser/parser-vasp/vaspparser/setup_paths.py
@@ -1,6 +1,18 @@
-import sys, os, os.path
+"""
+Setups the python-common library in the PYTHONPATH system variable.
+"""
+import sys
+import os
+import os.path
+
 baseDir = os.path.dirname(os.path.abspath(__file__))
-commonDir = os.path.normpath(os.path.join(baseDir,"../../../../python-common/common/python"))
+commonDir = os.path.normpath(os.path.join(baseDir, "../../../../../python-common/common/python"))
+parserDir = os.path.normpath(os.path.join(baseDir, "../../parser-vasp"))
 
-if not commonDir in sys.path:
-    sys.path.insert(0, commonDir)
+# Using sys.path.insert(1, ...) instead of sys.path.insert(0, ...) based on
+# this discusssion:
+# http://stackoverflow.com/questions/10095037/why-use-sys-path-appendpath-instead-of-sys-path-insert1-path
+if commonDir not in sys.path:
+    sys.path.insert(1, commonDir)
+if parserDir not in sys.path:
+    sys.path.insert(1, parserDir)