Merge pull request #1 from KoffeinFlummi/master

Fork Update
Merge pull request #2 from KoffeinFlummi/master

Fork Update from Original #2
Added Email
Merge pull request #1327 from jonpas/addEmail

Added email