add masqurage
Merge remote-tracking branch 'remotes/origin/add_masquage' & resolve conflicts