explained some stuff
Merge origin/master