enhance progress bar
resolve conflict
Merge branch 'master' of https://github.com/Azure-Vani/melodia