fix typos
Merge pull request #25 from bjornbm/master

Windows file system compatibility (for HVFS)
Merge branch 'upstream'
Bump version
Merge branch 'upstream'