closes Issue #8