Resolution for Issue #1

This change is in response to issue #1.