removed json
hide loading if done
do not format if isNaN()
Merge remote-tracking branch 'upstream/master'