Fixes #512

Well it seems to build and the only change is that a file name is changed , so I think we can merge this one.