Merge
Fix linking on WIN32
Rename argument interface

interface is a reserved word in VC