Merge pull request #1 from grayfuse/master

merging other branch
Merge pull request #2 from grayfuse/jeffsnewbranch

Merge pull request #1 from grayfuse/master