Update
Merge remote-tracking branch 'origin/master'
Adapted for Ubuntu MCSA Environment
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Better masking management