Merge branch 'gh-pages'
Change to prototype approach.