merge with quang.
Everything working as expected, except addding after fail validation

by Kim To, 18/10/2014