Closes #73