Return terms
Merged with phuonghuynh
Merge branch 'phuong-master'