Added local_path methods
Merge branch 'master' into heroku_fix