Issue #55 was implemented
Issue #54 was implemented
Merge pull request #73 from lthuangiang/issue54

#73: pull request Issue #54 was implemented
Merge pull request #72 from lthuangiang/55

#72: pull request Issue #55 was implemented