Fixed issue #8 in Windows EXE