Now works on both win and unix enviroments