Issue #29

Issue #28