Change conditional order.
Merge pull request #76 from miloops/master

Change conditional order.