Fix Issue #23. White space environment in Windows