Close Issue #80