Added progress indicator
Quick merge