resteorts Merge pull request #3 from OlivierBinette/master