thuan commit 03/11/2013