Merge & close #22