Merge pull request #4 from EddieMarquez/master

Please take a look at my code.