fixed bugs,issues/4,issues/5