Merge pull request #12 from firien/fedex-fix