Merge and close #265