closes #154