resolve bugs with some test
fix merge, update test
validation
Merge branch 'master' of https://github.com/nromanen/Ch-025 into shutka