fix socal address and works
Merge remote-tracking branch 'origin/master'