JS fix
Merge pull request #60 from canzalon/develop

JS fix