merge Sam Bao's changes to sprout-wrap