bug fix
Merge branch 'master' of github.com:gilzamir/jsg
bug fix