Now passing Resources as an argument
Merge remote-tracking branch 'origin/master'