closes #310