Merge pull request #7 from nukeviet/develop

Update code from nukeviet (19/02)
Fix error delete log
Format comment style
Merge pull request #109 from hongoctrien/develop

Format comment style, fix error del logs