To continue https://github.com/nuxt/starter/pull/279 and #278
To continue #279 and #278