Removed second path() call
Merge remote-tracking branch 'upstream/master'