Fix conditions
Merge branch 'master' of https://github.com/thl-mjv/euromomo