retry fixing
Merge branch 'master' of https://github.com/rexos/kokko
retry fixing