Issue #110

Issue #110