Don't depend on the current working dir
Use exposed BUNDLE_DIR
Merge pull request #1 from noonien/master

Don't depend on the current working dir