Archarodim:
	- The same as the previous commit without the syntax error :-/
	- Added an option to disable the macro creation
	- addition to previous comit: more debug information added to track a very rare issue with pets.
