Closes #87