closes #26