Issue #26 Fixes