ticket:5 fix
ticket:6 Merge branch 't5_validaton'