Issue #94

This commit is for Issue #94. FYI.