closes Issue #2