implemented task #3, #4

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