Fixed issue #47,#49,#53,#54,#55,#56,#57,#60