Keep Alive in both WOS and SPA
Merge branch 'master' of github.com:JoffreyLantoine/kore