Some simplification
Merge remote-tracking branch 'pblaho/gh-pages' into gh-pages