Merge and close #18