Fix canvas height (rebased on develop)

See #36