from bugfix branch

Signed-off-by: railsstudent <con_leung10@yahoo.com>