More updates
Merge branch 'master' of github.com:nicolasartman/everything-is-on-fire