Closes #65 Closes #66