first draft
Merge https://github.com/rviramontes/pongplus