incorporate changes for boxen

too much of a hassle to maintain the two branches