Merging master branch with my changes.
Corrected variable name
Merge pull request #89 from marcelaraujo/master

Adding some improvements