Merge pull request #4 from jonesd52/master

Pulling the newest changes into my fork.