Resolved this Issue - Closes #2