add loading; in progress 50%
Merge remote-tracking branch 'origin/master'