closes #7

closes #07