V2.0

Merging 2.0 version