For pull

With these two changes, generated site can even be opened locally from index.html.