Merge pull request #1 from OSP123/master

trying to figure out how to get the files updated from your master to mine