closes Issue #29