Merge pull request #36 from flashii/master

.htaccess issues
Merge pull request #37 from flashii/stable

Merge pull request #36 from flashii/master