Merge pull request #13 from pl-github/dev

Fix windows path problem
Merge remote-tracking branch 'upstream/dev' into dev