elex: made chrome compatible
Merge remote-tracking branch 'origin/master'