Branch Master, actual state of hosting
Merge origin/master