Ready for tests
Merge