Merge pull request #55 from radiosity/master

Fix warning when compiling with -pedantic.
I am the Debian maintainor, so i need to be listed so i can follow up on bugs and such. If you really want you can be listed as the maintainer, but then I need to change it for debian and it would be a PITA.
This is required if Debian is going to make regular releases.
Merge pull request #58 from super-nathan/master

Changes for Debian