desde master a branche
merged
addin some stuffs