Added Windows/Linux detection.  Needs testing.