Some paddle changes.
Some paddle changes. No 2.
Merge branch 'master' of https://github.com/smat88/test