Increased version, fix cleanup issue