Closes Issue #1