closes #31