New version
Merge branch 'master' of https://github.com/sbochkar/FYDP_v2