Updates for use with knitr