fade mask, bugs, calibration
Merge remote-tracking branch 'origin/master'