Strings improvement
Merge pull request #31 from filipealva/strings-adjustments

Strings improvement