Merge pull request #1 from evildmp/master

upstream merge
added my github name
Merge pull request #80 from bahendri/amend-my-name

Amend my name