Update to 2.1.8

Bump version number, slightly change arguments.