Adding Windows support

Fixes as per #3