Fixes to merge problems
Merge pull request #3 from jdu/bugfixes-paths

Fixes to merge problems