Bug fix on release1.0