Fix problem with proper displaying progress
Merge branch 'dev'