diff --git a/bin/heppy b/bin/heppy
index 1548f77..aedfcc3 100755
--- a/bin/heppy
+++ b/bin/heppy
@@ -10,12 +10,15 @@ do
     fi
 done
 
+bindir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
 if [ "$interactive" = true ]; then
     args=`echo $@ | sed -e 's#-i##g'`
-    ln -sf $HEPPY/bin/heppy_interactive.py tmp_heppy.py
+    ln -sf $bindir/heppy_interactive.py tmp_heppy.py
     ipython -i tmp_heppy.py -- $args
 else
-    ln -sf $HEPPY/bin/heppy_loop.py tmp_heppy.py
+    echo $heppy
+    ln -sf $bindir/heppy_loop.py tmp_heppy.py
     ipython -- tmp_heppy.py "$@"
 fi 
 rm tmp_heppy.py
diff --git a/setup.py b/setup.py
index 38e756d..b53adbd 100644
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,7 @@
 
 scripts = glob.glob('bin/*.py')
 scripts.remove('bin/__init__.py')
+scripts.append('bin/heppy')
 print scripts
 
 with open("README.md", "r") as fh:
@@ -10,7 +11,7 @@
     
 setuptools.setup(
     name='heppyfwk',
-    version='2.0.5',
+    version='2.0.9',
     author='Colin Bernet',
     author_email='colin.bernet@gmail.com',
     description='An event processing framework for High Energy Physics.',
@@ -50,7 +51,8 @@
         'scipy',
         'dill',
         'gitpython',
-        'pyyaml'
+        'pyyaml',
+        'ipython'
         ],
     scripts = scripts
 )