regular commit:
* windows support
* small fixes