Fixes for issue #40#47

matteogll wants to merge 2 commits intoimapex-training:masterimapex-training/101-github-lab:masterfrom

matteogll:mastermatteogll/101-github-lab:masterCopy head branch name to clipboard