Some tiny updates for makotan's changes.

Hi Makotan :)


Can you have a look if this works for you?
I just added some tiny things to your code...


Thanks - have a nice weekend!

Raphael