Windows compile fix
merge
configure.js fix
configure.js fixes