Add `preserve` option, more tests, bump 0.1.5
Merge branch 'master' into gh-pages