Code adjustments
Merge pull request #22 from filipealva/adjustments

Code adjustments