Resolved -Issue #23