updated v1.8.5 fixed #148, #146, #143, #141, #142

updated v1.8.5 fixed #148, #146, #143, #141, #142 #23