1.0.9 Issue #20