Version final 2.0

+ Add Comments
+ Clean Tests