Issue #118

Issue #118