my changes
Merge pull request #1 from douglasstarnes/master

my changes