closes #138