close #24 after merging changes manually