#61, #56, #59 fix
Merge branch 'master' of https://github.com/libreliodev/javascript