Fixup full paths. Adding heartbeat
Merge remote-tracking branch 'origin/master'