Tiny fixes

Replaced T/F with TRUE/FALSE.
Cleaned up mask example
Merge remote-tracking branch 'origin/master' into RegimeSwitch