Merge pull request #38 from ximenesuk/fix-canvasHeight-dev

Fix canvas height (rebased on develop)