updated; driver to 1.3.18
fix merge conflict
tests; remove .only