This closes #66