Issue #20
2.0.2