Hotfix/continuous integration