Do some review
Merge pull request #1 from tlbdk/master

Do some review