Merge pull request #4 from jonesd52/master

Pulling David's changes into my fork
Merge pull request #2 from AnthonyKazyaka/master

Merge pull request #4 from jonesd52/master