- added reqrite-rule for trailing /
Merge origin/master