Patch 2

Hi,
please read the comments for init() method.
Best,
Itudoben