Merge pull request #300 from t-b/fix_dll_relocation_problems