closes #87