MASSA fix
Merge branch 'master' of https://github.com/poner538/WLTSO