Fix code and bump version