#7
closes #8