I done fixig in new branch

Hi Martin,

I hope it is well on this branch

Regards
Zoran