Version history 1.0.0.0
Merge 1.0.0.0 to master