Merge pull request #1 from ddockhorn/master

jhjhjhjh
Merge pull request #2 from ddockhorn/branch2

Merge pull request #1 from ddockhorn/master