Upload progress
Merge branch 'master' of github.com:HriBB/cb5