Merge pull request #1 from andyinbox3/master

by fork
modify
abc
by andyinbox3 confilict