Fix function order
Merge pull request #44 from eustasy/master

Fix function order