closes Issue #28