CWTv2

Merging CWTv2 branch to master.