Closes #91