closes #155