tried to resolved issue # 39
Merge pull request #47 from tnguye91xula/issue39

tried to resolved issue # 39