edit welcome
Merge pull request #6 from cfljam/master

!Use my diffs!