ticket:5 Unit test without solution
ticket:5 Solution wi unit-test result
ticket:5 merge to master