convert to knitr; generated vignette differs, still need to fix that