fixed score loading in absence of element score files
updated version
Merge remote-tracking branch 'jingwei/master'