Merge pull request #2 from websanalyst/master

New Pull Request from Octavio