Fixed #93

Replaced Path.Combine with helper method
Merge pull request #94 from cjee/master

Fixed #93
Merge remote-tracking branch 'upstream/master' into metadata