Make order of modifiers consistent
Merge pull request #319 from guoguo12/master

Make order of modifiers consistent