tune style
Merge branch 'master' of https://github.com/aquaverde/aquarius-core