Latest commit 1547fca Jul 12, 2015 dinhviethoa Fixed potential crasher