More updates for new flags.
Merge pull request #39 from Hasimir/master

More updates for new flags.