originally developed by Rackspace
Merge pull request #1 from clayg/fix-origin

originally developed by Rackspace