Fix change and correct error
Merge branch 'release/0.5.0'