Added guessing
Changed some strings.
Merge branch 'feature/GUESS' into develop