Updated to support Jasmine
Merge branch 'master' of https://github.com/dev15squad/js