V2

Merging v2 changes into master