Support for custom bundles. Fixes #21.