Switched to BundleUtils and added OS X support.