Few small fixes
Merge branch 'master' of https://github.com/COSI-Lab/itl_lab_creation