Merge pull request #2 from Fluorohydride/master

sync
fix
Merge pull request #463 from luffySAMA/master

fix