Merged box-rendering fix back in. Fixes #15.