Complex changes
Merge branch 'database-test' of https://github.com/trousev/cleer into database-test