Fix #4 #7 - Windows path support + test
Merge pull request #11 from pgilad/master

Fix #4 #7 - Windows path support + test