Issue #116

Issue #116