Merge pull request #681 from tritao/dll-api