Merge DW 1.0.2
Update docs