Andreamoruno issue 12 and 8

please check