closes #8