enhance
Fixes #3