1.0.20 Issue #29, Issue #32