Resources fix
Merge origin/master