change order to respect what dev has to do
Merge pull request #1 from yanns/patch-1

change order to respect what dev has to do