Issue #118