Adding some resources I missed in previous commits
Merge remote-tracking branch 'origin/master'