Merge pull request #498 from pyr/feature-relative-load