#30 impl(incomplete) & #29 layout change
Merge branch 'master' of https://github.com/libreliodev/javascript