first work
Merge https://github.com/igorizr1/watu