Merge pull request #5 from flashii/master

Update .htaccess
Merge pull request #6 from flashii/stable

Merge pull request #5 from flashii/master