Fix for previous JS (2)
Merge pull request #39 from canzalon/develop

Fix for previous JS (2)