some fixes
fixes
Merge pull request #1532 from conejoninja/301redirect

301redirect