Merge pull request #1 from evildmp/master

merging upstream master
Merge pull request #2 from evildmp/master

merging upstream master
Merge pull request #3 from evildmp/master

merging upstream master
Merge remote-tracking branch 'upstream/master'
Merge pull request #327 from doriczapari/master

Added GitHub account name