Merge pull request #228 from sergiud/dll-export-fix