closes #37