Issue #28 and #26