Merge pull request #17 from hunner/fix_order