Merge pull request #1175 from toopay/path_helper

Path helper improvement