Closes #94