closes #25