Iteration C2 complete

Signed-off-by: Ippoippo <ippoippo-software@ippoippo-eco.com>
Merge branch 'refs/heads/Iteration_C2'