Merged Chuong's branch