Please merge my bugfixes

Since I will not be maintaining this repository for much longer I was wondering if you could merge these changes in your repository.

Kind Regards,

0xPr0xy