3 needed corrections, 1 optional feature

Hi Tijs,

I hope I'm following the correct procedure as I'm new to GitHub.  The changes however is what I needed to do recently to make a module developed for BPost work as intended.

Thanks for your good work.

Serge
Could you remove the commented lines?