Some fixes
Merge branch 'develop' of https://github.com/pepibumur/Wordme into develop