windows support a la justin.
Merge branch 'bumboarder'