Updated to work with spree master