merge develop -D org -I include -E exclude: PR 38 (Fix canvas height (rebased on develop))