Merge pull request #14 from fparker9676/master

Catching up