better layout
Merge branch 'master' of https://github.com/msfe/MFCORRIGO
flags is now najs in header
working with span