Merge pull request #3 from red-s-bean/master

update 1022