#2 fixed: Access to resources by direct link
Merge remote-tracking branch 'origin/master'