Limited number of explanation
Slightly change dictionary strategy
Remove password of the database
Merge branch 'develop'