Fixes #50 Replace instances of current_path()