small test fix
fix about initial load
Merge remote-tracking branch 'origin/master'
test fix
revised fix about initial load