Reduced amount of items generated
erge branch 'master' into gh-pages