Added suport for non win32 OSs
Removed some unconsistencies