V1.0 - TASKS #11, #12 y #13