Fixed some inconsistency
Second Commit
Unix Support (To be Tested)