Minor modifications
Merge remote-tracking branch 'origin/Resources' into Resources