Issue #21 fixing