Merge pull request #1 from evildmp/master

update master
added my github
Merge pull request #200 from jochem/amend-my-name

Amend my name