Closes #84