Working

Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>
Merge remote-tracking branch 'github/gh-pages' into gh-pages