Luzisto:
	- small fix
	- small fix
	- convert to api 6.0.2
