Custom bundles

Thanks for sharing this new feature! I took the liberty of introducing a few small changes, please take a look and tell me if you are happy with them before I merge on master. Thanks again for your support!