Version history 1.0.1.0
Merge 1.0.1.0 to master