Marketplace-ready version 0.4.5