Fixes #91
Fixes #88
Merge pull request #105 from InnovaLangues/master-axel

Fixes after validation