Issue #118 new