Merge pull request #1 from evildmp/master

Merging upstream master on Github
Merge pull request #2 from evildmp/master

Merging upstream master on Github
Merge pull request #3 from evildmp/master

Merging upstream master on Github
changed email to github name
Merge pull request #296 from jonathlt/amend-my-name-again

Amend my name again