Closes Issue #23 and Issue #24

Closes #23. Closes #24.