Merge pull request #1 from guygrigsby/master

pulling to update my fork
Merge pull request #6 from Menendez-Oscar/master

Merge pull request #1 from guygrigsby/master