Fix for previous JS
Merge pull request #38 from canzalon/develop

Fix for previous JS