Set proper metatags
Merge remote-tracking branch 'Origin/gh-pages' into gh-pages