Release 1.2.1 - Code review

Signed-off-by: PedroLourenco <pdrolourenco@gmail.com>