Remove file duplicates
Add message to waitUntil method
Merge remote-tracking branch 'origin/master'