Closes Issue #17