Merge pull request #14 from fparker9676/master

Catching up
Merge pull request #16 from fparker9676/worldwide

Merge pull request #14 from fparker9676/master