Merge pull request #36 from flashii/master

.htaccess issues