Merge pull request #1 from phpMyAlex/master

site changes