Merge & close #258