Merging Bug fixed from release-0.2.x branch