close #158
closes #157