Bug Fix in R1.0
Merge to master