Removed wrong informations
Merge branch 'dev'