Merge pull request #118 from freddylimpens/develop

fixed buggy js in chrome
fixed js bugs