js + &amp
Merge pull request #806 from luixxiul/development

js + &amp