Closes Issue #49