patch 1.0

Signed-off-by: marpy1990 <gh19900922@gmail.com>
Merge branch 'master' of https://github.com/marpy1990/Code.git