Consistency updates
Merge branch 'master' of https://github.com/Coenego/libraries-gateway into templates