Merge branch 'master' of D:\work\NoSQL\nosql-test with conflicts.
Improved reporting and logging