Merge branch 'gh-pages'
renamed objectAsString to file
Merge branch 'master' into gh-pages