Win64
replace name l
Merge pull request #403 from dnewbie/master

Win64