Close #310