#162 bugfix & #163 display fix
Merge branch 'master' of github.com:libreliodev/javascript