PR for #14

Add caching (rather non caching) headers
converted all tabs to spaces