Things are generic again
Merge branch 'feature/linux' of https://github.com/i-score/i-score into feature/linux