cross-namespace refactoring
Merge branch 'master' of github.com:freialib/prototype