issue #37 was implemented
Merge pull request #1 from lthuangiang/37

issue #37 was implemented