Some strings adjustments
Merge pull request #33 from filipealva/some-adjusts

Some strings adjustments