Merge pull request #1 from kevinmoorer/master

please add this change to your code
changes to kevin-moorer, added a few lines
another change
merging changes from origin
change 4