closes #171
closes #171