Merge pull request #1 from evildmp/master

Merged update from evildmp:master
added my github name
Merge pull request #233 from lucaippo/amend-my-name

Amend my name