Merge pull request #1 from cvanderschuere/master

Fixed BuildPath()
path.Join
Merge pull request #1 from ungerik/master

Merge upstream