Issue #7

Issue #7 resolved.