Closes Issue #23 and Issue #24