Irradiador v1 - entities bug fixed and enhacements - step 1.7