modifications from class
Merge pull request #1 from andrebautista/version2

Version2
Merge pull request #4 from ivanoats/version2

Version2