Getting this to work in Windows as well.

Using better version of separator expression.
Merge pull request #647 from CrossEye/master

Getting this to work in Windows as well.