Made search path relative to PWD
Merge branch 'heroku'