Changed the way the list is constructed
Merge branch 'master' into gh-pages