closes #85