Merge pull request #686 from Trass3r/master

towards Win64