Merge pull request #1 from tgerdes/master

Testing creating a pull request