Updated to deal with 6E00 and added support for win32 build options