Issue #40 Resolved