Modified files to adapt them to my how-to concept
Merge remote-tracking branch 'upstream/master'
Update