Merge pull request #1 from ktbyers/master

s