v1.8.2 & v3.0.1

Fixes #28
Fixes #18