Merge pull request #1 from evildmp/master

Merge
Merge pull request #3 from evildmp/master

Merge
Merge pull request #4 from evildmp/master

Merge
Changed name
Merge pull request #289 from wherka/amend-my-name

Amend my name