change order
Merge pull request #25 from jcgm/master

change order