update vignette to use knitr
Merge remote branch 'upstream/master'
Compiling with option -O when using optimised mode.