Fix #356 compatibility#361

KartikP wants to merge 16 commits intomainbrain-score/language:mainfrom

epflneuroailab-changesbrain-score/language:epflneuroailab-changesCopy head branch name to clipboard