Added flags
flag in header
Merge branch 'master' into au