fixed bounce effect
Merge branch 'bounce_effect'
edited bounce effect