Merge pull request #6 from LinZap/master2

add fix2