Closes issue #24
Closes #13