Closes #66