Resolve conflic

Signed-off-by: Thuy Dinh Xuan <thuydx@zendgroup.vn>
Merge pull request #20 from thuydx/dev

Resolve conflic