Added windows support (untested for conlicts)