Merge pull request #45 from AsaAyers/resolve-extensions