Fix the composition of titles
Merge branch 'master' of github.com:aquaverde/aquarius-core