Issue #54 Resolved