Merge pull request #61 from darioizzo/master

Mission 2 redefinition