almost theregit status
fixed the reloading issue
Merge remote-tracking branch 'origin/master'