Sorted page index and proper CamelCase
Merge branch 'master' into gh-pages