Closes Issue #45