Added "flag" and "order" elements for each options.
Merge remote-tracking branch 'origin/master'