resolve conflict
Merge pull request #10 from nvchinh0014/Feature_37

resolve conflict