Merge pull request #1 from evildmp/master

merging upstream master on github
added my github name
added my github name, again
merge LeMeteore
merge LeMeteore
Merge branch 'master' of github.com:evildmp/afraid-to-commit into LeMeteore-amend-my-name