fix a bug in IE 8 (array.map not available)
Merge remote-tracking branch 'origin/master'