This commit fixes #31 and fixes #29

This commit fixes issue #31 with reference to caching and fixes issue
#29 to fix the timestamp.
I have also included a minified version.