Modified so that "make bundle" works on OsX machines by making it more generic.
Merge pull request #401 from 5at/master

Enable "make bundle" to work on, at least, OsX.