Merge pull request #4 from fparker9676/newbranch

Newbranch
ready to ship