Issue #108

Issue #108