Added Windows Support

Improved the inteface a bit