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