[#59] done all changes from upper comment