included vignette, finalized testing for merging back to master, close #8