Refactoring
Refactoring
Merge branch 'js_improvements' of https://github.com/CanvasHS/Canvas.hs into js_improvements