Merge pull request #382 from reicast/native

Native
Restore the configuration loading to the original placement