Refactored and optimized the style of code
Added Wave Effect
Merge remote-tracking branch 'origin/master'