Closes Issue #139