update driver.dll and merge with master