Updated terms
Merge updates
Merge branch 'master' of https://github.com/nanograv-pire/nano-web