Version3
Merge branch 'dev' of https://github.com/raphi011/parcomp into dev