0.1.7.4 Issue #24 fix