Closes Issue #18