closes #312