1.0.5 Issue #15