Merge pull request #1 from evildmp/master

merging upstream master on Github
added my github name
Merge pull request #293 from Moerin/amend-my-name

Please add my email and github profile