Bug fixed and support for multiple OS's