Validation test and ready to merge with david's branch

Quang Nhan
18/09/2014