Merge pull request #154 from akashjain132/akash/optimise_site