V2.0

Final version for the graduation project