Waves solved
Toast message final
Final
Merge branch 'fcouceiro'