This closes #84