Release-0.2.0 Bug fix