Resolving path collision, fixes #19
Merge pull request #20 from WonderCsabo/master

Resolving path collision, fixes #19