tanduy implemented task #5

Signed-off-by: Trieu Khang <trieukhang.hoang@2359media.us>