This closes issue #24
This closes issue #26