fix
Merge branch 'master' of github.com:CandySunPlus/parallax
fix