andy4

andy4
Merge pull request #2 from angelandy/andy4

andy4
fixe confict

andd