Modified so that "make bundle" works on OsX machines by making it more generic.