Merge pull request #15 from eparis/generic-flag-normalization-thockin

Generic flag normalization