Improved version
Merge branch 'master' of https://github.com/Dani7B/CPD
Improved versions